From: Colin Walters <walters@verbum.org>
Date: Thu, 24 Aug 2023 01:17:27 +0000 (-0400)
Subject: cmd/export: Fold libarchive error handling
X-Git-Tag: archive/raspbian/2023.7-3+rpi1^2~16^2^2~42^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e578c019c5d20348663e0371ad2d5bc4664f76ed;p=ostree.git

cmd/export: Fold libarchive error handling

The helper function here doesn't quite carry its weight; this
brings us inline with having single line (no braces) error
return paths.
---

diff --git a/src/ostree/ot-builtin-export.c b/src/ostree/ot-builtin-export.c
index 193e17b5..4dda9c2b 100644
--- a/src/ostree/ot-builtin-export.c
+++ b/src/ostree/ot-builtin-export.c
@@ -51,16 +51,6 @@ static GOptionEntry options[]
         { "output", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_path, "Output to PATH ", "PATH" },
         { NULL } };
 
-#ifdef HAVE_LIBARCHIVE
-
-static void
-propagate_libarchive_error (GError **error, struct archive *a)
-{
-  g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s", archive_error_string (a));
-}
-
-#endif
-
 gboolean
 ostree_builtin_export (int argc, char **argv, OstreeCommandInvocation *invocation,
                        GCancellable *cancellable, GError **error)
@@ -89,30 +79,18 @@ ostree_builtin_export (int argc, char **argv, OstreeCommandInvocation *invocatio
    * supports.
    */
   if (archive_write_set_format_gnutar (a) != ARCHIVE_OK)
-    {
-      propagate_libarchive_error (error, a);
-      return FALSE;
-    }
+    return glnx_throw (error, "%s", archive_error_string (a));
   if (archive_write_add_filter_none (a) != ARCHIVE_OK)
-    {
-      propagate_libarchive_error (error, a);
-      return FALSE;
-    }
+    return glnx_throw (error, "%s", archive_error_string (a));
   if (opt_output_path)
     {
       if (archive_write_open_filename (a, opt_output_path) != ARCHIVE_OK)
-        {
-          propagate_libarchive_error (error, a);
-          return FALSE;
-        }
+        return glnx_throw (error, "%s", archive_error_string (a));
     }
   else
     {
       if (archive_write_open_FILE (a, stdout) != ARCHIVE_OK)
-        {
-          propagate_libarchive_error (error, a);
-          return FALSE;
-        }
+        return glnx_throw (error, "%s", archive_error_string (a));
     }
 
   OstreeRepoExportArchiveOptions opts = {
@@ -145,10 +123,7 @@ ostree_builtin_export (int argc, char **argv, OstreeCommandInvocation *invocatio
     return FALSE;
 
   if (archive_write_close (a) != ARCHIVE_OK)
-    {
-      propagate_libarchive_error (error, a);
-      return FALSE;
-    }
+    return glnx_throw (error, "%s", archive_error_string (a));
 
   return TRUE;
 #else